Bug fixes in UI classes and changes to the main menu UI