working on format
merge fix
Updates to make things nicer in app.html
merge conflict 2