Fixed bug in iPad view
Fixed bug in iPad view
Fixed bug in iPad view
Fixed bug in iPad view
fixed merge