Changed locals
Added disable button
A bit of cleaning