Code Refactor & UI Upgrades.