Refactor for inheritence, added panels