Many visual changes, also updated code style of chapter controller.