some updates to the pages and re-arrangements