changed layout; swap needs correction