Updated CSS to match boilerplate and fixed layouts