Minor form design issues fixed 2