New design added. Fixed some bugs