More formatting and fitting