Escaping fixes
Move filter since desc/visibility boxes were swapped
Some code style improvements

Better i18n strings, whitespace tweaks