layout updates and comments integration