Minor updates regarding the UI