Fixed: Significant front-end code clean-up