Added server directive
Added navbar
Put comments block right of code diff