Improved layout for stories
Merged