Refine settings UI
Cherry-pick media storage