Fix bugs and update pages