Moved decoration of prefix to MapView and also decorate the modals now