Refactor to panel class
Clean out a little cruft