Initial Redesign

First version with newest design. Still needs plenty of work