Some UI changes, fixed the default highlighting, some of the static content.