fix alignment problems