some fixes because of removal of margin and padding classes