admin rapid fixes- add device and separate material tables