Textblock: clean-up layout

Just some clean-up and moving a diagram