ISSUE #26 - Some update to the css styles
Merge branch 'ISSUE_26'