some modification on ui
complete merge