Bug Fixes & Design Updates