#151 Update the UI mockup to align with current UI