Final UI 8th commit