Updated to a newer version of API, removed some redundant ui selections