Final changes to UI