Fixed minor bugs;
Fixed UI