Fixed alignment issues