Minor fixes
Minor bug fix
Restore menu button previous location