Adjust styles and colors
Merge branch 'master' of https://github.com/pfletch1023/nodr
Fix styles