r.js build + minor changes on frontend