Combined with layout

Cut layout into different views. Still requires tweaking.