Fixed problems introduced by HTML layout changes