Minor changes to auto-layout