Changed the hierarchy of screens. Some fixes.