Finish Touch Tasks

Basically, I cleaned up the UI and finished CRUD.