Minor form design changes