move to single page design so it works