Updating admin menu so it's more intelligent and adding an override to the default article template to fix caption.