Commit 2  UI improved