Fixed merging errors, fixed single player ui issues