Fixed Design Bugs