Removed not needed js
Added consistent logic on changing status
Merge remote-tracking branch 'origin/master'