Updating graphics from android branch