fixed small bug with identifiers
moved core panel templates around