layout changes and better button