Clean up bits, fix menu animation