Fixed some naming conventions & image display