cleaned some things up, added content negotiation
convert main app to angular