[ci skip] Clean up & factor out scroll bars