Menu changes, fixes, improvements and Android!