Adjusted button and labels