Fixed the list.
Improved GUI