Button/styling fixes