updated machado, simplified homepage maps section like a metric tonne