Updated layout

Updates to layout and added outgoing control views.