Changed design. Hopefully - for the better :)