Refactoring stuff
-> home
Rewrote the ui stuff