Revert to fixed layout for now