Rewritten views to accomodate new orm
Fixes in css