Second Commit By NJ

Some minor changes in the UI.
Added TODO.txt