More formatting and button positioning