Added custom graphics
Fix bugs