clean up and fix vertical positioning