Revise create and search page