demo comments
fix layout bug