removed videos and maps
added new sidepanel
fixed merge