fix
clean up
move 'clicked' signal
clean up