Code refactoring.
Code refactoring.
Code refactoring.
Code refactoring.
Code refactoring.
Code refactoring.
Fixed a compiled error issue.
Merge pull request #33 from carlthronson/master

UI bug fixes