Several visual changes.
Merge branch 'dev' of github.com:BenOvermyer/medusa into dev