Merge branch 'Improving-design'

Conflicts:
public/app.js