translate with a filter
Minor HTML clean up.
Merged master fixed conflict.
Merge branch 'translate'