Top and sidebar menu fixes