Formatting and layour fixes