fixing design
added cities back
added users back
fixed conflicts