Merge pull request #59 from dmichiels/master

some cleaning, separate editPanel in a card and change circle