Minor UI changes and extraction of JS&CSS into separate files