Fix comment typo
Fix app grid UI issues