Huge core and UI update
Fixed merge troubles