merge khanh and shin
fix title layout