Salvaged some of Taylor's layout fixes