Changed UI and code modifications