Merge pull request #12 from jghezzi/rick

various styling and view fixes
changes from stash
styling and CRUD complete