modified: editing in modules. added: loading screen when fetching data