Cleanup markup and add Policies page