cleaning up ui
merging