Fix lineup sizing, swap and placement