more layout changes + quit screen