Made some updates to the UI