commit #2

Fixed screens and some minor layout changes