Added more button, also fixed threadlock