Navigator view - improvements + popin

cleaned the useless code + added a popin for flats