Final UI 2nd commit