Many Changes

Update to final design