Merge "Sidepanel - templates, controllers"