Update readme and refactor pages