Almost done with the revamp

Then i just need to get the various elements to display