Final UI 7th commit