title screen updates
merge conflict fixes