Changed UI and some features