Modify UI and some Logic