Added margin and padding properties