Bugfixes, added Suppliers tab