Complete revamp

Redesign, image swaps and more