Tidy up manager page and metadata parser