Added margin and padding