Fixed some presentation issues and constants in menu