various fixes for django 1.6 layout