Merge pull request #4 from HPACS/ENYO-2483

ENYO-2483: Work-around for the search api issue
ENYO-2483: Fixed the toolbar issue on small phones (Thanks to Olga)

Enyo-DCO-1.1-Signed-off-by: Yves Del Medico <yves.del-medico@hp.com>