Finishing conversion to skeleton page