Doing some Graphic & Bug Fix