Cleaned up and Fixed menu