Fixed #36. But Page isn't working