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