Xlarge layouts and UI fixes