New LHA layout

Implement Raef's advice