change layout, refactor clicks