add comment to all class, refine layout name