Removed unused classes, updated layout.