Theme integration

Put elements into boxes for cleaner UI.