added more UI
rebase