Added code highlighting and fixed some layout issues