Another Cleanup Run, and Creative Tab fixes