moving the tags so they are closer to the buttons that use them
Adding in the files table.