Made Final UI Changes