combined Yun's homepage changes to my current changes