Finished updates to get view UI