Changed buttons layout a bit