Graphic improvements. Close #3