fixed some bugs. added some design.