Feature/layout details