Listviews working

Updated the list views to show the correct data.
Cleaned up a few functions.
Added todo list