Complete merge of #132 with compiled app.css