Redesign...again

Another redesign.

Changed a few other things..