Redone UI.  Need to add button actions still