Cleaned up the code. We probably don't need the panels in separate
classes.