Fixed layout a lot
Deleting some unused code
Actually getting close to done