Major CLI improvements and admin component gen.