2013-01-03 - gui refactoring