removed default clicks and cleaned up the controllers