remove unused layouts and fix layout markup
fix class name typo