Code rearrange
Fix bug not letting uncheck options in Apps and Schemata tabs