More layout fixed (Salvadoresc)