New layout to work with ROS