Building out base layout and updating helpers