Add modals, maps and lots of fine tuning