Minor tweaks to layout and master.js