Fixed some bugs on User Interface