finish login and search
finish fixing