Organized imports, logger, and fixed bug for DEMO
tried to make toast messages