bigger startup window
mild reorganization