Redesign v1.0

Push redesign to master