Updated mockbot_integration and layout