* Changed TODO layout
* Added Ok and Cancel Buttons
Signed-off-by: Mohammad Al Faiyaz <alfaiyma@mcmaster.ca>