more layout tinkering y'all