Started work on fixing graphics