UI changes and some functionalities added