additional content fixup and menu fixing
Fixing layouts