Update graphics and bugs correction