Updating UI with tabs and spacing fixes