Fixed some form inconsistencies - OK btn left of Cancel btn, no more flat style controls