fixed some alignment problem