Swap positions
Update to dark design