added search
added icons
added more menu items
added menu item limits
Merge remote-tracking branch 'origin/master'