Fix phone screen
merge
some error