Adjustments to fit new theming