Merge feature-addons branch

Re-implement addons UI from feature branch.