Still playing around with tab alignment

Hopefully this is the last of it.