Standardized naming, bug fixes, and added UI elements