add line numbers, tweak layout classes