Source code view with Code highlight. Small fixes