Fix layout, add header 3 and adjust shell command layout