Better(??) UI
Fixed Conflicts