Fixed some bugs
Fixed some display bugs