Final UI CHanges