Layout changes

B)