[#76253826] udpate top page and some refactoring