Adding Manufacturers UI & refactoring