Added return to main menu within action bar
Added correct search function to hostAdd
Added search function in better location to all needed lcoations
fixed slave display issue
Fixed merge conflicts