More fixes, level swap, level layout