updated styles
adfadfasdf
finish merge