Small changes. Cleaned up button pushes, panels.