Appearance improvements, refactoring to complement swing version