Add panels, fix menu and paddings