Design Project Fixes

Fixed up some major issues