Fix vertical line
Various improvements to my draft