Final UI 3rd commit