solve warning& fix buttons layout