ADDED: new design, a lot of visual things to fix