Move staff to higher folder

- add loading messages
- include canvas when loading