Fix layout and design