Page components now back (still non-functional)