Made some subtle changes to UI