Change layout to be more Django-ish
More changes to app layout
Refactor layout
Refine README