Updating the UI with 6.1 changes