Fixed memory and swap picker alignment issues