Fix layout and move styles to correct place.