hopefully this fixes the merging errors. Also I added a navbar but still have to place it on the rest of the adminpages