[improved] layout