UI improvements and hardcoded containers.
Added DemoCustomComponent for Demo purposes.