Bug Fixes & Design Update