Reimplemented more panels