Simplified the code / code cleanup

- Code cleanup
- Fixed a bug where the focus fix wasn’t functioning properly
- Create a new element-creator functionality