Fixed alignment bugs.