Big amount of small little fixe, added some modal dialogs