Modify some margins to improve design