Update humans and robots
Strip down file
Cleanup layout