styling changes
resolved app.js conflict