Modify UI and Fix Bug