updated UI
fixed git conflict