layout & comment fix