Fixed some bugs with the design.