minor bugs, refactorings, list hint layout fix