Design Update

Nothing much, just a huge design update. Nothing special removed.