Refined the architecture of the MultiMediaHolder and Navigator. They should be much easier to update from now on.