Cleanup menu configuration and display items per Android APIs
Massive cleanup and code verification to improve UI response