Some important UI Changes