Move .container into UI component

Fixes #3