various styling and view fixes
resolved conflicts
Merge pull request #12 from jghezzi/rick

various styling and view fixes