Renamed for consistency, added little logic to the UI library