Current page now working