Options Dialog Cleanup/Design