UI/JS refactoring

Cleanup and uniformize front-end code