Improved Location form