More work on compact layout