GUI enhancements - added tabs.
Updated TODO.
Merge pull request #2 from blaskovic/master

Merging GUI enhancement and TODO updated