Right side of city update 1

Updated layout. Added majority of road placeholders. Need to finish the
roads and do the building placeholders on the right side.
Merge branch 'master' into DesignTeam