#66 Adding home and search buttons to handler