Updated controller layouts and support view (JHS)