re-orged controllers & views, added quotes