Added Settings view, fixes on search