UI changes

- Removing node_modules
- Doing some refactoring to fix mainly popup issues