Updates to UI Structure