cleans up remaining markdown in docs
adds iconic page detail
fix merge conflicts