Layout changes and improved wacky colors