UI final commit