Minor graphical change + refactoring