Improvements in the new theme