Reworked spoke pages to rely on display suite