fixed driving to/from buttons a little