Final UI 1st commit