styles
FIx conflicts
Comment style adjustment
General sizing styles