Refatored yeoApp, Todo + add comment field