Fix Button layout alignment and animation