Completed code changes and searchbox, modal related code updates