Updated the UI + Added ui-select