Bug fix: Clean up of some screens and menus.