Add cleanup view and rebuild theme
Merge with upstream