Move buddy panels into templates