fix map & add form links