layout, comment feature and refactorings