cleaned up ui
Resolved conflict