Fixed a couple bugs and refactored some display code. Refer to issue #18 and issue #19.
Fixes #18
Fixes #19