Bug & Design Fixes