Design update

Design is looking good. Need a place to revert to incase I go CRAZY with
the design and stuff breaks :)