Fix indentation and layout issues