Level 2 city placeholders

Added more expansion layout and simplified some existing placeholders