More button and form changes