new look and feel, add some more info