added some UI
merging