Better layout, styling and code layout