Minor form design issues fixed