Some more finishing touches
Rearranged content for view and datastore