added two new layout screens and started on the layout classes