Small fixes on theme

Please read commit messages for detailed changes.
You'd need the div in case a list is specifying custom class or style for additional rows