[DEL] haanga files
[EH] layout improvements