line # fixes
layout and translation fixes for #960