Version 0.6.6 - more UI refactoring