UI Changes according to Ofir requirements