Changed the circles layout

and added some minor functions on the listeners.