Changed design to be more fluid