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

... helper.