Minor form design issues fixed 3