Add ruler
Improve formatting