Last minute updates before Final Presentation :p
Slight UI modifications, general code cleanup.