Update scene
Fix markup and emoticons
Add default test data to mock server