working on UI restoration and using submodules