fixed static panel
renaming stuff