Better visuals for substacks and correct expansion