Fixed A*, changed layout