Fix #88, changes in layout