Made some fixes to the CSS and did a little refactoring in the model and helper.
Merge pull request #14 from gd7627a/benjamin_refactor

Made some fixes to the CSS and did a little refactoring in the model and...