Button Size adjusted
Alignments and Cleanup