Layout update and several fixes