Menu button and minor fixes