adjusted circle xml and fixed create and edit dialog xml
changed button to be CheckBox so it can be changed onClick
merge