cleaned up vertical and horizontal layout