various fixes to accomondate theme_cms