Menu button and overlap fixes