Changed design, minor fixes