Fixes UI stuff [ work in progress ]

This PR will basically fix UI stuff and solve the layout of the repo.