Added more graphical features