Tweaks layout and cleans up app.js