fix sizing/styling bugs
Merge branch 'dev'