fix up camera controls and claim device layouts