A few minor changes trying to get layout to fir correctly