Fix layout and styling