Added more complete UI elements