UI Changes & Added Icons