Clean up and minor bug fix.
CSS Refactor, added colors.