Improved menu controls. Still work to be done on it though.