Fixed issues with new theme