change layout; make stuff work