fixed
fixed
updated a whole bunch of front styles
Merge branch 'styling-2'