Comments
Refactor gui display code for clarity