Cleaning up the margins and the menu