A lot of fixes

- updated how the build works
- Fixed general layout
- cleaned up