Furthur improvement of common helper for theme header