UI: Improved Containers