chg: dev: Refactored code and fixed minor UI elements.