[WIP]: Refactor some components that shpuld be in the return statement instead of being created every render. Missing refactor code that is too large