Layout update
Fixes