Switched to flat UI. Improved JS organization