Added some UI and JS stuff