modal added
fixed modal page
merge with dan front page
add city id to city textfield