Improve a top page design, close #2