merged controllers
fixed icons
toggle sidebar