working on layout; done with most pages besides city