updated html and css for new design
updated css for text type
annoying db commit
Merge branch 'roryhoulding-master'