More UI elements, some error handling