More work on the souce code view