Remove app page dependency on base template