Some clean up, better multi button handling