Cleanup
Shuffled content display flow. Added initial pages support