Added a status combo box, needs some implementation
Updated TODO