Made more changes to the UI