Added some checks to enable/disable buttons on status