some minor bugs fixed & ui improvement