Layout update and minor fixes