Remove bottom margin and rename views