MOB-228 Fixed search scroll bug and moved the cancel button
MOB-228 Changed cancel button position
MOB-228 Fixed space break
Merge pull request #158 from carllarsson/MOB-228

MOB-228 Fixed search scroll bug and moved the cancel button