Final UI 6th commit