Fixed Button layout and checklist calculations.