Remove numbers and fix margins