completely eradicated use of deprecated layouts

(for real this time)