new layout + Jarrett's stuff