Removed constants from UI class