Added some minor changes to loader.js and view template...