Made some menu changes and ran code through a processor to clean it and fix indenation issues