Begin to support comments, Improved layout