Removed unnecessary styles, replaced px with em
merge