Attempts at fixing button selecting