Implement some design/spacing improvements. Add rest of short stories