finish refactoring circle buttons. dealing with general look and feel.
merged