Many fixes. Made search in mobile, not very well designed
Merge