Added icons for off state, added labels to search fields