Graphic improvment and some other changes