Better layout and improved lineup/super villain dealing logic