2013-11-27 minor refactoring & fixes some display issues