Changes for UI and new action 'circle'