improved button clicking