Make scenario form prettier and add map view when applying scenario

Also do some more fixes