Improve story form