Update styles for rems
merge layout