improve design and add pages