UI Enhancements

Fixes #84
Fixes #82 (need General stat)