Feature/05 layout details