Updated layout on Habitat