Complete redesign

Most of the redesign is complete. Some tweaking is still required