UI and functionality added