Updated Button Alignment Issues