Added homeline to tags + Map + New Layout