Updated UI elements to have desired look and function