Remove unused assets.
Fix popovers, simplify button code