Updated for new theme, small tweaks